Merge remote-tracking branch 'aperezdc/fixes'
authorColin Walters <walters@verbum.org>
Tue, 28 Aug 2012 13:45:39 +0000 (09:45 -0400)
committerColin Walters <walters@verbum.org>
Tue, 28 Aug 2012 13:45:39 +0000 (09:45 -0400)

Trivial merge